Merge "IWYU"

core/jni/android/graphics/Paint.cpp

@@ -29,6 +29,7 @@
 #include "SkBlurDrawLooper.h"
 #include "SkColorFilter.h"
 #include "SkFont.h"
+#include "SkFontMetrics.h"
 #include "SkFontTypes.h"
 #include "SkMaskFilter.h"
 #include "SkPath.h"

libs/hwui/hwui/PaintImpl.cpp

@@ -99,7 +99,7 @@ void Paint::setAntiAlias(bool aa) {
 
 ////////////////// Java flags compatibility //////////////////
 
-/*	Flags are tricky. Java has its own idea of the "paint" flags, but they don't really
+/*  Flags are tricky. Java has its own idea of the "paint" flags, but they don't really
     match up with skia anymore, so we have to do some shuffling in get/set flags()
 
 	3 flags apply to SkPaint (antialias, dither, filter -> enum)