am a11ac455: Merge "Fix debuggerd issues."

* commit 'a11ac45536f0722becefccdb6b58378c5d9d0d4b':
  Fix debuggerd issues.