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

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



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