Merge "Merge "Add /vendor/xbin to the list of directories of executables" into nyc-dev am: 088f0e7c40 am: deb4e6e596" into nyc-mr1-dev-plus-aosp