Merge "emulator: update EGL emulation library path" am: 7e7457f225
am: a01809939e

Change-Id: Iee2bbd6964ee927c70b7649628b37035d4a95073