Partial backport: Fix makefile warnings.

Test: it builds.
Bug: b/37159108
Change-Id: Icaad7e1f0fdab542f2f78c779def64ef57a3bc42
Merged-In: Icaad7e1f0fdab542f2f78c779def64ef57a3bc42
1 file changed