Merge "Refactor GLFunctorDrawable to use new SkCanvas API for clip region"