Update to #137 - Return to `emulator`, remove --abi.