am 6e92ade0: am db24577b: Merge "Work in progress to enable build system support for Clang."

* commit '6e92ade0a6cd8aea8f074fdc44f375ef2f1d50b7':
  Work in progress to enable build system support for Clang.