am 81b46980: am f8a66bb3: Merge "Remove some non-unused makefile generality."

* commit '81b4698059c37ac36aa74d1498bef5654580ad3f':
  Remove some non-unused makefile generality.