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

* commit 'cf657ad46cab1c9124665e9afa6f2a89d33bba41':
  Fix clang build.