Merge "Add android::base::ScopeGuard" am: 5c3961c547 am: e24876879a am: ff0cb987ce
am: c0d7642347

Change-Id: I30971a5e2edbd9fd7b66947bc095e0991fcc226b