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

Change-Id: I2b6061d0c726887ec39ffc527355d71abf598b85