Merge "Fix IndentingPrintWriter after JDK switch."