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

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

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