Merge "Build target path before closedir()." into nyc-dev
am: da2a8ca

* commit 'da2a8ca00636f63c8cec6135a5d5675a71c505f1':
  Build target path before closedir().

Change-Id: I1a66d782f3d6831c720efdd7ce9df0772513c1f0