am 93a1f7ae: Merge "Minor makefile cleanup."

* commit '93a1f7aef9998efedba08fa99ba378488d092b4c':
  Minor makefile cleanup.