am fa60dc0a: am c3349b5a: Merge "emulator egl translator: Fix eglGetProcAddress."

* commit 'fa60dc0a24a95b92d107464b0d13df77f804db85':
  emulator egl translator: Fix eglGetProcAddress.