Split Android debug bridge

The non-device Android debug bridge must be separated from the device-specific Android debug bridge.
The non-device Android debug bridge can be injected through constructor and the device specific Android debug bridge can be resolved using the $injector.
This way the device-specific Android debug bridge will be unique for each device.

Author: TsvetanMilanov

lib/common

@@ -6,7 +6,7 @@ import Future = require("fibers/future");
 import * as constants from "../constants";
 import * as semver from "semver";
 import * as projectServiceBaseLib from "./platform-project-service-base";
-import * as androidDebugBridgePath from "../common/mobile/android/android-debug-bridge";
+import {DeviceAndroidDebugBridge} from "../common/mobile/android/device-android-debug-bridge";
 import {AndroidDeviceHashService} from "../common/mobile/android/android-device-hash-service";
 import {EOL} from "os";
 import { createGUID } from "../common/helpers";
@@ -393,7 +393,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 
 	public deploy(deviceIdentifier: string): IFuture<void> {
 		return (() => {
-			let adb = this.$injector.resolve(androidDebugBridgePath.AndroidDebugBridge, { identifier: deviceIdentifier });
+			let adb = this.$injector.resolve(DeviceAndroidDebugBridge, { identifier: deviceIdentifier });
 			let deviceRootPath = `/data/local/tmp/${this.$projectData.projectId}`;
 			adb.executeShellCommand(["rm", "-rf", this.$mobileHelper.buildDevicePath(deviceRootPath, "fullsync"),
 				this.$mobileHelper.buildDevicePath(deviceRootPath, "sync"),

lib/services/android-project-service.ts

@@ -1,7 +1,7 @@
 ///<reference path="../../.d.ts"/>
 "use strict";
 
-import {AndroidDebugBridge} from "../../common/mobile/android/android-debug-bridge";
+import {DeviceAndroidDebugBridge} from "../../common/mobile/android/device-android-debug-bridge";
 import {AndroidDeviceHashService} from "../../common/mobile/android/android-device-hash-service";
 import Future = require("fibers/future");
 import * as helpers from "../../common/helpers";
@@ -102,7 +102,7 @@ class AndroidLiveSyncService extends liveSyncServiceBaseLib.LiveSyncServiceBase<
 	private _deviceHashService: Mobile.IAndroidDeviceHashService;
 	private get deviceHashService(): Mobile.IAndroidDeviceHashService {
 		if (!this._deviceHashService) {
-			let adb = this.$injector.resolve(AndroidDebugBridge, { identifier: this.device.deviceInfo.identifier });
+			let adb = this.$injector.resolve(DeviceAndroidDebugBridge, { identifier: this.device.deviceInfo.identifier });
 			this._deviceHashService = this.$injector.resolve(AndroidDeviceHashService, { adb: adb, appIdentifier: this.$projectData.projectId });
 		}