[automerger skipped] Merge "Add an aosp target that supports 64-bit app only"...

[automerger skipped] Merge "Add an aosp target that supports 64-bit app only" am: f5941dae am: 9ad93982 am: 48af4f65 am: f0f00695 -s ours am: c480376e -s ours

am skip reason: Change-Id I57116fe67cbe1322f348c9d0506655f32a900dcc with SHA-1 d001fb33 is in history

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

Change-Id: I40be45989db02fe934c6059f260d4c09f9b383d9