Upgrade emulator to emu-master-dev build 5109391 am: 03846ab903
am: b8a31f11a1

Change-Id: I11fc71990e69b29d26fb5d3e5fc467bc36b130ec