Merge "More Makefile fun for --debuggable."