am a7083e0d: am 8387fc93: Merge "Move to C++ for debuggerd."

* commit 'a7083e0dd29aa5102e25c5a978c072b0a2bf94f4':
  Move to C++ for debuggerd.