fix bad conflict resolution, include uiauto bootstrap when launching instruments
fix bad conflict resolution, include uiauto bootstrap when launching instruments

appium/appium,appium/appium,appium/appium,appium/appium,appium/appium,appium/appium,Sw0rdstream/appium