Upgrade emulator to emu-master-dev build 6349003 am: e286380718

Change-Id: I494e70e8e79eb97e5d31e7c57d16b95c99e51a5a