Bug 996443: carry emulator arch automatically. r=jgriffin