Merge "fix hairline clip" into master-skia

https://skia.googlesource.com/skia/+/4cba202b7162fb5f364235dd29f0bdbd53a8e33c

Change-Id: Ie0d9d7efe951efe4a539c51ab68a55e0676b9e05