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

Change-Id: I7a3e3c0ef09aa02cc0b556fbe2066e987e7f3752