Update makefiles after merge
Torne (Richard Coles) authored
Change-Id: I11a8f58d20970d334a9312ff83861b0e1f122af9
adf667e6