Upgrade emulator to emu-master-dev build 5955183
am: eb08eaa623

Change-Id: I5003409db2bcee31af3aa3d89bba008ea98077c6