Reconcile core/Makefile w/ cm-11.0

Change-Id: I55c0e9195e9f2f3c22f433899970bff0c78f61b8