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

Change-Id: I81bff856294196ab3eb02ac83ee569f90e8eea77