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

Change-Id: I4b0e90e209c035345cdde301b9a962d14679e661