Merge "Add ability to run on host for x86/x86_64."