Update makefiles after AOSP push.

Test: none
Change-Id: If3ce74f4d2250d33820cbd864ff56bba6f9e6b67
15 files changed