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

* commit '5de3dbf3fa0c9ef5789abfe8ffe0e53071ab893b':
  Fix build and javadoc.