Cherrypick change to skia
Cherrypick change to skia

Change-Id: I9845f8d042fb89fe0f4876f0021b9ec486ac3ef5

roalex/android_external_skia,roalex/android_external_skia,roalex/android_external_skia,roalex/android_external_skia