Merge "Add an aosp target that supports 64-bit app only" am: f5941dae am:...

Merge "Add an aosp target that supports 64-bit app only" am: f5941dae am: 9ad93982 am: 48af4f65

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

Change-Id: I8d3efb84735272b01a9555bf4e0800960b077239