Merge "Remove excess dependency on libGLESv2"