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