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

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

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