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

Change-Id: Icd804b0a9bbdfcdea13aa3d441a24b9f20c49cda