Merge "Fix negative eglGetCurrentSurface tests."