Merge "Fix Android's glEGLImageTargetRenderbufferOES() wrapper" into froyo