am cc6d37df: am 4aa9da3f: Merge "Build fix."

* commit 'cc6d37df1373291d98718f7c93dbb5cd65d4c0bb':
  Build fix.