Merge "core: ARM 32-bit targets must be built with 4k elf alignment" into main...

Merge "core: ARM 32-bit targets must be built with 4k elf alignment" into main am: dfa43734 am: 6c8e80a8 am: b0b9264f

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



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