am 92a64fc9: am 21e38a35: am 723b2fc3: Merge "Faster deduplication in OatWriter."

* commit '92a64fc9996013524baa7979de9f0ca140ddf7a1':