Merge "EGL: Properly strip out unknown attributes"