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

* commit 'fb1b6daca82f25e2f40164c1b7cd9f3c6e36737c':
  Remove makefile cruft.