fixed UntetheredRunningActivity.java conflict