Update makefiles.

Test: pass
Change-Id: Id4e4a60149e7c8462d541bd114d96a7fc22c1f35
5 files changed