am 799812cd: Merge "Clean up makefile cruft."

* commit '799812cd6f7f9aa4a87d81dafd273d51ac5ba992':
  Clean up makefile cruft.