Upgrade emulator to emu-master-dev build 5418875 am: 6323db1a67
am: e8e5e6f456

Change-Id: I58ad1e4675f6931f5caad6d2ec343a221e8836ad