Upgrade emulator to emu-master-dev build 4542460 am: fdd0c8f88f
am: b6c9fd229d

Change-Id: I58e0cff68fcfe7103a16bc34e9d18e2f0cfcd7ff