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

Change-Id: I4b5643fd53e271f7e6b5093865da050482ec282c