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

* commit '7d691756e8bcdbd66889f7c07c82fbcd07a8d793':
  Make allocations use unique_ptr.