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: 60a35dce am: c4ca4586

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



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