Merge "Add "-encoding UTF-8" option to javadoc."