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

Merge "riscv64: minor ASLR bits changes." into main am: d741c232 am: 2d574743 am: a0124bab am: 50bed420 am: c3b46b16

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



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