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

Change-Id: Ibabe5f06de096be8c9bd08996367acc3d6565263