Merge "Don\'t check the host JDK tools when build/core/config.mk is called from envsetup.sh." am: a63d379aab
am: fb89fd36b2

* commit 'fb89fd36b21c557fa4873ad4c707f6dd07752ed0':
  Don't check the host JDK tools when build/core/config.mk is called from envsetup.sh.