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

Change-Id: If0d920ad96d52906f2ccef70fa01f78247e23639