Merge "Add close_file flag to OpenArchiveFd()"