Merge "Revert "Remove dependency of OpenGL es version."" into devel/master