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

Change-Id: I2df08c8ec5ed244304f3c89d0fde86eda8fb5520