Bug 861486 - Update the emulator. r=jgriffin
Merge m-c to birch.
Merge m-c to birch.