am 6d9eb604: am 7fb8f627: am fa60dc0a: am c3349b5a: Merge "emulator egl translator: Fix eglGetProcAddress."

* commit '6d9eb604639c26bcf59610c5c8527b1c5be98c82':
  emulator egl translator: Fix eglGetProcAddress.