Clean-up makefile for hammerhead

Change-Id: I5813b5344662e96dc9c017726b095f4279d477cd
Merge "Clean-up makefile for hammerhead" into pac-5.0