Merge to XFA: CFX_ByteString/WideString header changes

Original Review URL: https://codereview.chromium.org/1117413002
Original Review URL: https://codereview.chromium.org/1118983003

TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/1125493002
3 files changed