Bug 861486 - Update the emulator. r=jgriffin