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

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