Merge "Remove dependence on SK_LEGACY_PICTURE_DRAW_API."