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

Change-Id: I89a8416c2be1c26d23fff3d80939b48131b3f17d