Remove unnecessary GLES include
add back GLES2 headers for test.cpp
remove more unnecessary GLES2 includes; switch one GLfloat to float directly
Remove unnecessary GLES header includes.

Approved by Ricardo Salveti, PS Jenkins bot.
Merge branch 'bzr/master'