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

Change-Id: I6fc769675421792b59ce30ac2d602add30f165ce