Merge "16k: Support max-page-size alignment greater than 4096 for x86-64" into...

Merge "16k: Support max-page-size alignment greater than 4096 for x86-64" into main am: 06b7b6c4 am: f476e19d

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



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