Merge "Fix incorrect name in eglSwapBuffers log wrapper"