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

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