Upgrade emulator to emu-master-dev build 5372406
am: d0e6c4b00b

Change-Id: Ie3cadb92f5eba010e625d6eb6ce34ea5a1acea0e