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

* commit '068f85214d32cfd07d032416221006bf8eebc193':
  AAPT: Output only 64-bit arch when multiArch is true