Merge "AAPT: Output only 64-bit arch when multiArch is true" into lmp-dev