Merge "Debuggerd: Fix debuggerd_test" into oc-dr1-dev