Update makefiles.

Test: pass
Change-Id: I925baccbe51a32b7b7f3f66cf2918d017ee6b039
12 files changed