Merge "Update to new SkShadowUtils interface"