Upgrade emulator to emu-master-dev build 3696197
am: c383a21820

Change-Id: Ice6a3c869fa73010d90f84de02fc092c73f816d0