Merge "16k: core: Add flag to make AOSP page size agnostic" into main