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

Change-Id: I03f09fbddef275b455de52dbdf2d9ea573263df9