Update Makefile

* Merge Port r345240