Merge "Add android::base::ScopeGuard" into oc-dev-plus-aosp