Merge "Make libcompiler_rt host x86 builds use the x86 sources" am: f41ad20414
am: 0f76156fd4

* commit '0f76156fd40f9138e298f660c8b062d221c48a14':
  Make libcompiler_rt host x86 builds use the x86 sources

Change-Id: I69d97f52d02d0c60d2c3cf26d13fccb50d4a8c98