[automerger skipped] Merge "Allow android::base::ScopeGuard in STL containers" into pi-dev
am: 64250b5abe  -s ours

Change-Id: I224a160667f7c5a8a61b5640a902ebbf65560dd7