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

* commit 'e2e15d6da1936890117ad21fb6b18cce321c7d2b':
  Fix incorrect name in eglSwapBuffers log wrapper