Update paths to ICU configuration script, update to ICU 61.1 by default

Fixes path regression caused by #5010

build.sh

@@ -408,7 +408,7 @@ done
 if [[ $USE_LOCAL_ICU == 1 ]]; then
     LOCAL_ICU_DIR="$CHAKRACORE_DIR/deps/Chakra.ICU/icu"
     if [[ ! -d $LOCAL_ICU_DIR ]]; then
-        "$PYTHON2_BINARY" "$CHAKRACORE_DIR/tools/configure_icu.py" 57.1 $ALWAYS_YES
+        "$PYTHON2_BINARY" "$CHAKRACORE_DIR/tools/icu/configure.py" 57.1 $ALWAYS_YES
     fi
 
     # if there is still no directory, then the user declined the license agreement

tools/icu/configure.py

@@ -90,7 +90,7 @@ def get_headers(icuroot, headers_path):
 
 def create_msvc_props(chakra_icu_root, icu_sources_root, version):
     prelude = """<?xml version="1.0" encoding="utf-8"?>
-<!-- DO NOT EDIT THIS FILE. It is auto-generated by $ChakraCore/tools/%s -->
+<!-- DO NOT EDIT THIS FILE. It is auto-generated by $ChakraCore/tools/icu/%s -->
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>""" % os.path.basename(__file__)
 
@@ -208,11 +208,11 @@ def extract_icu(icuroot, archive_path):
     shutil.rmtree(tempdir)
 
 def main():
-    chakra_icu_root = os.path.normpath(os.path.join(os.path.realpath(__file__), "..", "..", "deps", "Chakra.ICU"))
+    chakra_icu_root = os.path.normpath(os.path.join(os.path.realpath(__file__), "..", "..", "..", "deps", "Chakra.ICU"))
 
     argparser = ArgumentParser(description = "Download and set up ICU for use in ChakraCore")
     argparser.add_argument("-y", "--yes", action = "store_true", help = "Skip ICU License prompt text")
-    argparser.add_argument("version", help = "ICU version to download. Not compatible with --archive", default = "60.2", nargs = "?")
+    argparser.add_argument("version", help = "ICU version to download. Not compatible with --archive", default = "61.1", nargs = "?")
     argparser.add_argument("-i", "--icu-root",
         help = "Path to directory to extract ICU to. Resulting directory will contain a single subfolder, 'icu', which contains ICU's source tree",
         default = chakra_icu_root