am b6c6be75: am 723b2fc3: Merge "Faster deduplication in OatWriter."

* commit 'b6c6be75fe68c823b5f4a82cad1c1b84362517e1':