Fix some make file duplicates

Change-Id: Id226b2cde93cf0f81a6dd33fbdf70f8f954cade8