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

Change-Id: I266fcafc3208813b29f79efc783644d7a746dfa8