am 81b84311: Merge "Fix clang build."

* commit '81b8431173837fe9ea21990948d6af30809fb056':
  Fix clang build.