Merge "Debuggerd: Fix debuggerd_test" into oc-dr1-dev am: 394c1ad959  -s ours
am: 5b77682b0d  -s ours

Change-Id: I102648105a4d9722b5a322e55991f411ee637b7b