Merge "Do not assume CLANG is used when custom toolchain is provided" am: 7a16eb05cc am: ae817d47dd
am: ee1f0d0899

Change-Id: I2e52c6eded65e02e75b4fd3717c7d0d4e5806988