Merge changes from topic "update-no-bionic-page-size" into main am: f28fa571...

Merge changes from topic "update-no-bionic-page-size" into main am: f28fa571 am: e8c4ae90 am: 98ca0096

Original change: https://android-review.googlesource.com/c/platform/build/+/2859825



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