Merge "Make libcompiler_rt host x86 builds use the x86 sources"