am 6db591b9: Merge "Directories/symlinks changes for x86_64 support"

* commit '6db591b98cef806b8fc01bde94b100798c871327':
  Directories/symlinks changes for x86_64 support