am 953e6667: am fc0d7812: am d5de25f8: Merge "Use unique_ptr to call closedir."

* commit '953e6667808d59ada8e6111fa8481870b1f2efb9':
  Use unique_ptr to call closedir.