Remove duplicate entries in makefiles

Change-Id: I3c5912b8fc80e0f047ae6c883760ad32fb27e1b6
Merge branch 'cm' into HEAD