Merge "Support native test prebuilts for X86+ARM builds" am: bf28f5933a am: 4f87826d23 am: b7303cde95
am: 9a5562312c

Change-Id: Ib8eb51136c7755eb52e9f015b4798566ddd6f3e3