Merge "Make JAVA_TOOLS_JAR error a little more descriptive."