am c8e9c014: Merge "Clean up makefile cruft."

* commit 'c8e9c0148525d853588f606fe8315368ea134615':
  Clean up makefile cruft.