Merge "Fix build and javadoc." into honeycomb