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: 1b51f6ec am: 3675aaf5

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



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