Merge "adb: fix use after free of atransport."
am: 1cdcc5f7e8

Change-Id: I07a1214ef5278b96adc0111fc2ae4c247fdc9015