resolved conflicts for merge of 70555a16 to master

Change-Id: Ibb8ea3159e2a3fa7a70f2359a02c4625812995a8

diff --cc core/Makefile
Simple merge

diff --cc core/main.mk
index 1048c9b,c02ee5b..4e00e70
--- 1/core/main.mk
--- 2/core/main.mk
+++ b/core/main.mk
@@@ -399,7 -403,7 +399,7 @@@ ifdef is_sdk_buil
  sdk_repo_goal := $(strip $(filter sdk_repo,$(MAKECMDGOALS)))
  MAKECMDGOALS := $(strip $(filter-out sdk_repo,$(MAKECMDGOALS)))
  
- ifneq ($(words $(filter-out $(INTERNAL_MODIFIER_TARGETS) checkbuild emulator_tests,$(MAKECMDGOALS))),1)
 -ifneq ($(words $(filter-out $(INTERNAL_MODIFIER_TARGETS) checkbuild target-files-package,$(MAKECMDGOALS))),1)
++ifneq ($(words $(filter-out $(INTERNAL_MODIFIER_TARGETS) checkbuild emulator_tests target-files-package,$(MAKECMDGOALS))),1)
  $(error The 'sdk' target may not be specified with any other targets)
  endif