Update makefiles (2/2).

Test: pass
Change-Id: Ic7e6289c7b69785491708ce0acbb657f4c704229
41 files changed