Update makefiles after merge

Change-Id: I77961fc375e68c40c3abc5c1d59808bc3b8b2636
10 files changed