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

* commit 'a6be63e9ab11eeb8d9820ef41449e7537c278a5d':
  Make allocations use unique_ptr.