Merge "debuggerd: Fix return type in error case" am: 09e3fe25b0
am: ff8d576f09

Change-Id: I16c96fc9aae4a2c01a5104d5ad36136575aca505