Merge "Fix shadowstack init crash on 16K page system" into main am: 52e3190b9b am: faf3237564

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2651111

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