Merge "Revert "Revert "More Makefile fun for --debuggable."""