Merge "adb: add missing condition_variable include" am: 6097150de6
am: 4a3a792c24

Change-Id: I47703540bb2fbb27895b7f90684f0de7db085c7d