Merge "Fix javadoc which broke build." into gingerbread