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

* commit 'f3109db835d3c08128d18e7955c0745bad67d2ec':
  Directories/symlinks changes for x86_64 support