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

Change-Id: I43f11a9755a96394343a54f5ff8ef51cc16e0192