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

Change-Id: I08f50d119ae161d762a16b0dd67b7a2741096b56