am fd2c1307: Merge "Fix build."

* commit 'fd2c1307e66573c398ff53eab25ee82735277091':
  Fix build.