Merge "Integrate adb with fastdeploy" am: 15eb065bbb
am: 9954b2c3d5

Change-Id: Ia4bc2835e424e74739c1b9de0e2e477da69bfcdb