[automerger skipped] Upgrade emulator to emu-master-dev build 6278574 am: 9c1912d89f am: c7d2d06358 -s ours am: d8cafa402d -s ours

am skip reason: Change-Id I54ae600c215da62c3375c85209ea9e8990597202 with SHA-1 924aa30ed3 is in history

Change-Id: I9711a7287b61744c43e086966918d2f02ef5d51b