Merge "Remove onDrawSprite API as it is no longer exposed via SkCanvas"