am ae0bee53: am 81b84311: Merge "Fix clang build."

* commit 'ae0bee53b84d4ffda84270852ace1841e13f5db8':
  Fix clang build.