fix bad conflict resolution, include uiauto bootstrap when launching instruments

lib/devices/ios/ios.js

@@ -30,6 +30,7 @@ var path = require('path')
   , mkdirp = require('mkdirp')
   , getSimRoot = settings.getSimRoot
   , fruitstrap = path.resolve(__dirname, '../../../build/fruitstrap/fruitstrap')
+  , uiauto = require('appium-uiauto')
   , UnknownError = errors.UnknownError;
 
 // XML Plist library helper
@@ -291,7 +292,7 @@ IOS.prototype.makeInstruments = function () {
     app: this.args.app || this.args.bundleId
   , udid: this.args.udid
   , ignoreStartupExit: this.shouldIgnoreInstrumentsExit()
-  , bootstrap: path.resolve(__dirname, 'uiauto', 'bootstrap.js')
+  , bootstrap: uiauto.bootstrap
   , template: this.args.automationTraceTemplatePath
   , sock: sock
   , withoutDelay: this.args.withoutDelay