Pull the phone library directly. Delete old version.

third_party/libphonenumber/cpp/src/encoding_utils.h

Index: third_party/libphonenumber/cpp/src/encoding_utils.h
===================================================================
--- third_party/libphonenumber/cpp/src/encoding_utils.h	(revision 111991)
+++ third_party/libphonenumber/cpp/src/encoding_utils.h	(working copy)
@@ -1,40 +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.
-
-#ifndef I18N_PHONENUMBERS_ENCODING_UTILS_H_
-#define I18N_PHONENUMBERS_ENCODING_UTILS_H_
-
-#include "base/basictypes.h"
-#include "utf/utf.h"
-
-namespace i18n {
-namespace phonenumbers {
-
-class EncodingUtils {
- public:
-  // Decodes one Unicode code-point value from a UTF-8 array. Returns the number
-  // of bytes read from the array. If the array does not contain valid UTF-8,
-  // the function stores 0xFFFD in the output variable and returns 1.
-  static inline int DecodeUTF8Char(const char* in, char32* out) {
-    Rune r;
-    int len = chartorune(&r, in);
-    *out = r;
-    return len;
-  }
-};
-
-}  // namespace phonenumbers
-}  // namespace i18n
-
-#endif  // I18N_PHONENUMBERS_ENCODING_UTILS_H_