Merge "riscv64: minor ASLR bits changes." into main