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

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