am 0d31d487: am d3b61d18: Merge "Clean up the debuggerd makefile."

* commit '0d31d4877ca451c9e15a0651ab2b4827556afeff':
  Clean up the debuggerd makefile.