Merge "Replace usage of hidden API FileUtils.setPermissions with Os.chmod"