Merge "adb: set main thread in transport tests."