Update makefiles after merge

Change-Id: Ibc727df40336ed97ba65c42fb585e274c5c6e3d0
12 files changed