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

Change-Id: Ia213e96166a8f0a68e2f6fe0fda3adb0fa4da640