Merge "Modify EGL robustness tests to use VBOs"