Merge "Debuggerd: Fix debuggerd_test"