am f6192a2d: am 3566fe27: Merge "Fix build break by not building compiler-rt without clang."

* commit 'f6192a2d3350c792c82aee9ca4d6935d80a590a3':
  Fix build break by not building compiler-rt without clang.