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

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



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