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

Change-Id: I4bb931e7df83a623f8c40064ccfcb6b27b12f68e