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

Change-Id: I6cfd66e59d5ec106ccd8483482bb6090a2afac66