Merge "Emulate replace clip ops using SkAndroidFrameworkUtils::ResetClip"