Merge "Allow android::base::ScopeGuard in STL containers"
am: 3b279aa5c7

Change-Id: I0c57afc84e8bd3ab9de7c1bcb9f743c272d04aaa