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

Change-Id: Iaae91362a27248732d45501738c8b1afcb147ecb