Merge "Support native test prebuilts for X86+ARM builds"