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