Merge "Fix debuggerd argument parsing." am: 99ed65234c am: 014d9df418 am: c3501a4dff
am: 8339ab4a7b

Change-Id: I9e36832a9a1fb3755c842748980a7c461ffc5da4