Upgrade emulator to emu-master-dev build 6309183 am: 3bba23f40a

Change-Id: I39ff78e7e9fb0109df5c1e4cd090421d259e4946