Merge "Fix OpenGlEsVersionTest" into gingerbread