Merge "Small debuggerd improvements."
am: 4463c820a6

Change-Id: I893c52600464c2541c2be8701d831a4d11e12836