Update makefiles after merge

Change-Id: I894b63d54939fc0d3ce7f3aa6f97dfd71ea2bfc5
10 files changed