Merge "emulator: update EGL emulation library path" am: 7e7457f225 am: a01809939e
am: bd97d15891  -s ours

Change-Id: I9e7ba7d454972aedd785c88d0e9a369119069ab1