am c73fdbd6: Merge "Clean up makefile cruft."

* commit 'c73fdbd622cfedfbc2ee46f654e71bb17bd9c147':
  Clean up makefile cruft.