Merge "adb: fix deadlock."
am: 68599f5759

Change-Id: I9c57920319ef8b76b313c6fa736a282fe54e857b