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

Change-Id: I84e08970759f74628f420b9a058561df09ffb083