Merge "Do not use degenerate frames in EGL tests" am: f5971fe17f