resolved conflicts for merge of 67e0c2a6 to master

Change-Id: I7940c7ae3dd1900180e4767f1c86957db4cf3a1f

diff --cc core/config.mk
index 51283ee,ba09895..b283b8c
--- 1/core/config.mk
--- 2/core/config.mk
+++ b/core/config.mk
@@@ -270,10 -267,6 +270,10 @@@ ifeq ($(HOST_OS),darwin
  HOST_JDK_TOOLS_JAR :=
  else
  HOST_JDK_TOOLS_JAR:= $(shell $(BUILD_SYSTEM)/find-jdk-tools-jar.sh)
- $(error Error: could not find jdk tools.jar, please install JDK-6.0, \
 +ifeq ($(wildcard $(HOST_JDK_TOOLS_JAR)),)
++$(error Error: could not find jdk tools.jar, please install JDK6, \
 +    which you can download from java.sun.com)
 +endif
  endif
  
  # It's called md5 on Mac OS and md5sum on Linux