Merge "Fix include-what-you-use warning in common/file_util.cc."