Upgrade emulator to emu-master-dev build 5048539
am: 8ed509ded6

Change-Id: Idfb3113c05b0f34a1e554c9fccdc280b0ae0eaf1