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

Change-Id: I9bf0f3134fcde834e48c228b52e2069659d11fab