Updating make files per changes to production branch

Change-Id: I635986e8be4a155bf35db1c0aa1744fc6769f49b