am ec6156f9: Merge "Fix the build."

* commit 'ec6156f9e884ba85c76a9c4683f83f18b3f64afa':
  Fix the build.