Update makefiles after merge

Change-Id: I209c6246ece9f59fd432e427df5717f788d3a3c4
10 files changed