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

* commit '37f3302d6eea5561bddd8caf75729f0d8df7b6ae':
  Directories/symlinks changes for x86_64 support