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

Merge "soong: ARM 32-bit targets must be built with 4k elf alignment" into main am: 83b86ccc am: 6c4c474c am: 0a60e1a2

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



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