Update makefiles after merge

Change-Id: I7b157667f40aa10eba6b73da5ea3e1ea6fff5110
172 files changed