am d4c7a1cf: am a11ac455: Merge "Fix debuggerd issues."

* commit 'd4c7a1cfad22a55d31b6a27b859fb534194fb0e4':
  Fix debuggerd issues.