Merge "adb: fix use after free of atransport." am: 9d65321250 am: 15f0402787

Change-Id: I6e4b8540167162d42c023bb20adc103c1251c5e9