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

* commit '9516a3335f29bc5a2c33b5bed10d3d27d41aecc7':
  Allow arm prebuilts for x86_arm builds

Change-Id: Id213e11f192339a9d89a360378fc5ccb162f91ec