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

Change-Id: Iba2a2316825dcc4e693e991ea89921951a137563