Merge "Deduplicate archive.ar_rev_id"