Merge "Fix for rounded-rect clips with filters." into master-skia

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

Change-Id: I26408caf3760cf4aa73b6effbe820164e23a47e8