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

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