am 7478bc13: am aa70c332: am 0236e6b2: Fix the build.

* commit '7478bc13084c1d3ab798116c7194c142aab2b4e2':
  Fix the build.