Merge "Small debuggerd improvements." am: 4463c820a6 am: 24cb6dd765
am: 9208ed7d51

Change-Id: If41cc84258feeab769802b620a6f2a3fe6a1e445