Merge "Implement efficiently non-rectangular clips in GLFunctorDrawable"