Upgrade emulator to emu-master-dev build 5924900
am: cb5c21b097

Change-Id: I47b2a6e4b6f6ac5fe72f098ed1601c6929f4d0b1