Merge "adb: fix deadlock."