Upgrade emulator to emu-master-dev build 5959125
am: 2216f24263

Change-Id: Ib1145a54c66611257180ee9773f377bea496178d