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

Change-Id: I57f21609525ac2daa365dceae4a6d1a32c0bde15