Merge "Remove unused adb_set_transport." am: b898ce00fa am: 32ca0ab616 am: e62a3b4bdc
am: b8e3a31e67

Change-Id: If7087d7680324215793410f36a306487cf4b24df