Merge "whitespace" into master-skia

https://skia.googlesource.com/skia/+/dc065f2

Change-Id: I4fc20abab7823a1829d6e74022586d6e9bf89a2a