am 97b3e43f: am e2e15d6d: am a0ab49bb: Merge "Fix incorrect name in eglSwapBuffers log wrapper"

* commit '97b3e43ff108cb4761450732fc02e4b69502b8a0':
  Fix incorrect name in eglSwapBuffers log wrapper