Merge "Plumb 2 EGL surface attributes to ANGLE"