Merge "Debuggerd: Fix debuggerd_test"
am: 0c65c5c856

Change-Id: Iea265f9ef85f03ce28262203ff71aa3794eeee71