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

* commit '0f6def890cf03a3e1997af525ad57ed18a56d927':
  Fix debuggerd issues.