Upgrade emulator to emu-master-dev build 4988733
am: d96d829520

Change-Id: Ibf409d2adb7c7aa7b44217b83fd6364609c4e951