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

Change-Id: I1b8daea74c1779f30b724a1c03a55b374870a2e7