Merge "Fix build breakage due to API update in SkShader."