Merge to XFA: CFX_ByteString/WideString header changes