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

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

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