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

Change-Id: I7e22f4c247694f85a51fe9800ba2abe11429edf4