Merge "adb: set main thread in transport tests." am: f5518d04f1 am: cd5c1a8e87
am: 352fa00662

Change-Id: Ifad2da6cd250bea6b9b8d64f92caa53f46bb4374