Merge "Add /vendor/xbin to the list of directories of executables" into nyc-dev