Merge "core: Makefile: fix a typo in a comment" am: 80ad0df403 am: 7fa7758bd3
am: d76fa585f2

Change-Id: Ie150099c0c6e40f964430f46b231b62d71899fbc