Merge "debuggerd_client: properly wait for completion." am: 372d8a2931
am: 6340d91308

Change-Id: I90058d0d8bb89a839b262456e1b91ef15abfa71f