Merge "Converts a drawPaint through a rrect clip to a drawRRect in GrDrawContext." into master-skia

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

Change-Id: I3369ae7c84ed6736d67295acc9b174e0334bfa8d