Merge "FileUtils.java: Don't treat open access modes as flags"