am b3c7c0ab: Merge "Fix build and javadoc." into honeycomb

* commit 'b3c7c0abdb9ff5fe0ef78b0211a902cac6e2cfe4':
  Fix build and javadoc.