Merge "Fix glDrawArrays() calls in EGLImage tests."