Merge "Allow android::base::ScopeGuard in STL containers" into pi-dev