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

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