Reformat Makefile

No functional change.
Further simplify Makefile

No functional change.
Merge remote-tracking branch 'upstream/master'