Merge "Fix debuggerd argument parsing."
am: 99ed65234c

Change-Id: I8899fc35a450eb34425db5eb0b307f4fa1354338