Update makefiles.

Bug: N/A
Test: N/A
Change-Id: Ie4ccc7f7638e9eca3bcd43c36c16f2f0053ac596
4 files changed