am 9e145766: am a975f64d: am 5b66af54: Merge "Fix clang build."

* commit '9e1457661ad263e3d8cd38118f70d030b63aa070':
  Fix clang build.