Merge "Revert "Create wrapper around Shader native implementation""