Merge to XFA: Fix compilation under chromium checkouts.

Original Review URL: https://codereview.chromium.org/1132163002

R=thestig@chromium.org
TBR=thestig@chromium.org

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