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