am 58818ab5: Merge "Fix the build" into honeycomb

* commit '58818ab5b5dd14f5b40602cd07114de78c110b58':
  Fix the build