Merge "Directories/symlinks changes for x86_64 support"