Merge "Don't wrap EGLImageKHR and EGLSyncKHR anymore"