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

* commit '4d27e92d7aaa2a6d771be7ff2695e46058b5d506':
  Fix build and javadoc.