Merge "debuggerd: synchronize cosmetics to internal"