am 0a350f4f: Merge "debuggerd: synchronize cosmetics to internal"

* commit '0a350f4f0857cd4a42b5099b8fda7766a35398cb':
  debuggerd: synchronize cosmetics to internal