Merge "Allow android::base::ScopeGuard in STL containers"