Resolved conflicts for merge of 05a7a955 to klp-modular-dev-plus-aosp

Change-Id: Ife0d1ef3d5a0cb4b91c8b813d259c947c85018f8

diff --cc core/Makefile
index 0fa33cb,3aebf41..55391dd
--- 1/core/Makefile
--- 2/core/Makefile
+++ b/core/Makefile
@@@ -1494,23 -1496,8 +1494,7 @@@ atree_dir := development/buil
  
  sdk_atree_files := \
        $(atree_dir)/sdk.exclude.atree \
-       $(atree_dir)/sdk-$(HOST_OS)-$(HOST_ARCH).atree \
-       $(sdk_tools_atree_files)
 -      $(atree_dir)/sdk.atree \
+       $(atree_dir)/sdk-$(HOST_OS)-$(HOST_ARCH).atree
  
  # development/build/sdk-android-<abi>.atree is used to differentiate
  # between architecture models (e.g. ARMv5TE versus ARMv7) when copying
@@@ -1537,8 -1518,7 +1521,7 @@@ deps := 
        $(INSTALLED_SDK_BUILD_PROP_TARGET) \
        $(INSTALLED_BUILD_PROP_TARGET) \
        $(ATREE_FILES) \
 -      $(atree_dir)/sdk.atree \
 +      $(sdk_atree_files) \
-       $(sdk_tools_atree_files) \
        $(HOST_OUT_EXECUTABLES)/atree \
        $(HOST_OUT_EXECUTABLES)/line_endings