Merge "metricsd: Replace scoped_ptr with unique_ptr." am: c947a13772
am: b9e0742ef5

* commit 'b9e0742ef569369936cd42e99468b28843c1c30c':
  metricsd: Replace scoped_ptr with unique_ptr.