am 7d153833: am a85afdb8: Merge "Add support for WITHOUT_CLANG"

* commit '7d153833d8002c824af9c8904be6b1765e864445':
  Add support for WITHOUT_CLANG