Merge "Drop CLANG and CLANG_CXX in the environment" am: 27a55cd3c7 am: f03398b651
am: ecf97649bd

* commit 'ecf97649bd4ae5b2f1084874d9e809b73d9b4095':
  Drop CLANG and CLANG_CXX in the environment

Change-Id: I543ce82c8d6260724551c2b51aa7ae0aeb19c3d5