Merge to XFA: Fix relative includes within core/

core/src/fxcrt/fx_basic_utf.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "../../include/fxcrt/fx_basic.h"
+#include "core/include/fxcrt/fx_basic.h"
+
 void CFX_UTF8Decoder::Clear() {
   m_Buffer.Clear();
   m_PendingBytes = 0;
 }
 void CFX_UTF8Decoder::AppendChar(FX_DWORD ch) {
   m_Buffer.AppendChar((FX_WCHAR)ch);
 }
 void CFX_UTF8Decoder::Input(uint8_t byte) {
   if (byte < 0x80) {
     m_PendingBytes = 0;
@@ skipping 58 matching lines @@
   FXSYS_assert(pwsStr != NULL);
   if (len < 0) {
     len = FXSYS_wcslen(pwsStr);
   }
   CFX_UTF8Encoder encoder;
   while (len-- > 0) {
     encoder.Input(*pwsStr++);
   }
   return encoder.GetResult();
 }