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

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

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