Update makefiles after merge

Change-Id: I54fd8fa2b5737e4622f9edd92901c13a88159378
394 files changed