am 3dd536ff: Merge "More Makefile fun for --debuggable."

* commit '3dd536ffd7e8f82e4587964545b272acbd61d68e':
  More Makefile fun for --debuggable.