am 88dd36d2: Merge "Makefile cleanups."

* commit '88dd36d2d1f0df6d8263ada619497742a4dd21a8':
  Makefile cleanups.