am 39d72dcd: am 22bd6386: Fix clang build.

* commit '39d72dcdd162af365717956acd4280ead441a70a':
  Fix clang build.