Merge "Update method signature to match private Skia header."