Upgrade emulator to emu-master-dev build 6295583 am: 8ff285a0a2 am: 4c53eb585c

Change-Id: I73d065f2d27b001ac3b67c4dd8377073e7160ac5