Revert "Emulator: update development to 2362bfb6"
am: 50dc27b2ca

Change-Id: I2bd58c5bf960ef899bb664748f4e55db25dd5e43