Pull the phone library directly. Delete old version.

third_party/libphonenumber/cpp/src/normalize_utf8.h

Index: third_party/libphonenumber/cpp/src/normalize_utf8.h
===================================================================
--- third_party/libphonenumber/cpp/src/normalize_utf8.h	(revision 111991)
+++ third_party/libphonenumber/cpp/src/normalize_utf8.h	(working copy)
@@ -1,50 +0,0 @@
-// Copyright (C) 2011 Google Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <string>
-
-#include "utf/unicodetext.h"
-
-namespace i18n {
-namespace phonenumbers {
-
-using std::string;
-
-struct NormalizeUTF8 {
-  // Put a UTF-8 string in ASCII digits: All decimal digits (Nd) replaced by
-  // their ASCII counterparts; all other characters are copied from input to
-  // output.
-  static string NormalizeDecimalDigits(const string& number) {
-    string normalized;
-    UnicodeText number_as_unicode;
-    number_as_unicode.PointToUTF8(number.data(), number.size());
-    for (UnicodeText::const_iterator it = number_as_unicode.begin();
-         it != number_as_unicode.end();
-         ++it) {
-      int32_t digitValue = u_charDigitValue(*it);
-      if (digitValue == -1) {
-        // Not a decimal digit.
-        char utf8[4];
-        int len = it.get_utf8(utf8);
-        normalized.append(utf8, len);
-      } else {
-        normalized.push_back('0' + digitValue);
-      }
-    }
-    return normalized;
-  }
-};
-
-}  // namespace phonenumbers
-}  // namespace i18n