am 6cf34775: am 47a73363: Merge "Factor out some of the makefile cruft."

* commit '6cf34775513859dd48b986162e761aff57df82fb':
  Factor out some of the makefile cruft.