Merge "Update to call new Skia APIs."