am 4355c0c9: am e1e3d278: Merge "Clean cruft out of makefiles."

* commit '4355c0c98644c37f0511257403bbfb71b342e2df':
  Clean cruft out of makefiles.