Cherry pick 2 more patches from the upstream

source/i18n/uspoof.cpp

 // Copyright (C) 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html
 /*
 ***************************************************************************
 * Copyright (C) 2008-2015, International Business Machines Corporation
 * and others. All Rights Reserved.
 ***************************************************************************
 *   file name:  uspoof.cpp
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
@@ skipping 628 matching lines @@
 uspoof_getSkeletonUnicodeString(const USpoofChecker *sc,
                                 uint32_t /*type*/,
                                 const UnicodeString &id,
                                 UnicodeString &dest,
                                 UErrorCode *status) {
     const SpoofImpl *This = SpoofImpl::validateThis(sc, *status);
     if (U_FAILURE(*status)) {
         return dest;
     }
 
-    // Check that at least one of the CONFUSABLE flags is turned on.  If not,
-    // return an error.
-    if ((This->fChecks & USPOOF_CONFUSABLE) == 0) {
-        *status = U_ILLEGAL_ARGUMENT_ERROR;
-        return dest;
-    }
-
     UnicodeString nfdId;
     gNfdNormalizer->normalize(id, nfdId, *status);
 
     // Apply the skeleton mapping to the NFD normalized input string
     // Accumulate the skeleton, possibly unnormalized, in a UnicodeString.
     int32_t inputIndex = 0;
     UnicodeString skelStr;
     int32_t normalizedLen = nfdId.length();
     for (inputIndex=0; inputIndex < normalizedLen; ) {
         UChar32 c = nfdId.char32At(inputIndex);
@@ skipping 108 matching lines @@
 U_CAPI const USet* U_EXPORT2
 uspoof_getCheckResultNumerics(const USpoofCheckResult *checkResult, UErrorCode *status) {
     const CheckResult* This = CheckResult::validateThis(checkResult, *status);
     if (U_FAILURE(*status)) { return NULL; }
     return This->fNumerics.toUSet();
 }
 
 
 
 #endif // !UCONFIG_NO_NORMALIZATION