am bf40b5ba: Merge "Revert "More Makefile fun for --debuggable.""

* commit 'bf40b5ba88dff872f252c975dd6570571c7d5a90':
  Revert "More Makefile fun for --debuggable."