am c26f2084: Merge "Remove makefile cruft."

* commit 'c26f208487aa1d7cfb9baf2d0579a5696875c5d0':
  Remove makefile cruft.