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

Change-Id: I933ea04cc8e96d9c9fe32226526741f44b4a86cd