Bug 841836 - Update emulator, r=armenzg