Support force GLES1 compile, for testing
Merge remote-tracking branch 'upstream/master'