am 1a3fb16f: am a6be63e9: am 7d691756: Merge "Make allocations use unique_ptr."

* commit '1a3fb16f0674fe3c63e48129100019fd45041895':
  Make allocations use unique_ptr.