Merge "Use android.util.IndentingPrintWriter instead"