am d5de25f8: Merge "Use unique_ptr to call closedir."

* commit 'd5de25f819c0f8e2589d786571bface3409e13ff':
  Use unique_ptr to call closedir.