Merge "Fix makefile warnings (typo)." am: 7a23b30bd0  -s ours
am: 44f40bc03d  -s ours

Change-Id: I80432196b8bec5a53bba7d7c64563e71c07486ed