Merge "Allow arm prebuilts for x86_arm builds" am: fcaae6bee8 am: 99e2c216b4
am: 6a55b1c681

* commit '6a55b1c6813050d04c39e0705da4f056f3981511':
  Allow arm prebuilts for x86_arm builds

Change-Id: Icb91d7af56463fa97484ef36ee3e8275b2e5810e