Merge "Debuggerd: Fix debuggerd_test" am: 0c65c5c856
am: fb3a6e2391

Change-Id: I0cab14b4167fc612eea9f7b85ad120d5b9d2f8a8