Merge "Disable prebuilt_build_tools for non-x86 targets"