Merge "Make EGL GLES2 multithread sharing tests more robust."