Merge "16k: Fix linker_utils_test to support 4kb and 16kb page sizes" into main am: 26cfc21243

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

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