Merge "Fix OpenGlEsVersionTest" into froyo