[Java]: Fix generated output formatting for indentation.
Merge branch 'master' into jdk6backport(android)