[automerger skipped] [automerged blank] Support 64-bit arm_on_x86_64 2p:...

[automerger skipped] [automerged blank] Support 64-bit arm_on_x86_64 2p: 930dcf53 am: 66893c61 -s ours

am skip reason: Merged-In I87332d793dcdd4859766c9067b9fd53f9e4c2516 with SHA-1 34581212 is already in history

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

Change-Id: I13f23364fe0cdcbeb9f1e4b5a3aa7c78cdd2ac1f