Merge "switch to non-deprecated SkBlurStyle type"