am 22bd6386: Fix clang build.

* commit '22bd6386e28c9bd3fd15d896bc224cd989dd871b':
  Fix clang build.