Merge "riscv64: minor ASLR bits changes." into main am: d741c23288 am: 2d5747438c

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2755787

Change-Id: I8eee6397162b12c90c6d0d388bf742d0fe85877b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>