am 0d64fcb4: Merge "Clean up some makefiles."

* commit '0d64fcb46f594a89484cd112bc979903eaeda4b3':
  Clean up some makefiles.