Merge "adb: add missing condition_variable include"