am 36d04e37: am ac4efdd2: am 0a350f4f: Merge "debuggerd: synchronize cosmetics to internal"

* commit '36d04e37ee84f17220442002d880473d465ca5ae':
  debuggerd: synchronize cosmetics to internal