am 522c1d34: am e18ed89e: Merge "Remove makefile cruft."

* commit '522c1d340b6c1742d3e47aad27b974e43fad4bc2':
  Remove makefile cruft.