Also revert "Follow on to: f05dc40c31d1883b46b8bb60547087db2f4c03e3" After these changes, multiple lldb tests are failing. Calls to CreateTargetWithFileAndArch(None, None) appear to fail after these changes. This reverts commitf05dc40c31and1fba21778f.