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

Change-Id: Id679b2971c2f57eee3a7fa17e77563a16406a1a2