Merge "Integrate adb with fastdeploy"
am: 15eb065bbb

Change-Id: I0dbc04ad35c5842b796433aee86993ba01858a88