am 2b801087: Merge "Fix Clang build."

* commit '2b80108735eb6cce8656cfdd638aa8985d7fec62':
  Fix Clang build.