Merge "16k: Fix pthread tests to support 4k/16k page sizes" into main am: 837e4d1f52 am: 42e65898fe

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

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