Merge to XFA: Fix fx_string.h compile error under chromium checkouts.

Original Review URL: https://codereview.chromium.org/1127043004
TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/1131553005
1 file changed