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

Change-Id: Ib778422f09d9d7fbfbc1069769097c7abf514adb