More on removing (unreasonable) use of std::auto_ptr.

Change-Id: I98f5fb22eecb7749e4c86e1ce52965b0c73641ca