Merge "std::unqiue_ptr<..., decltype(&fn)> seems to be the preferred idiom." am: 2f21b7cecd am: f2f4e784a4 am: 236a9903fe
am: 0ce32b03e4

Change-Id: Ie7f001688664b428d98a6835256ee8d16c07efed