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

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