Merge "Allow shell to read /vendor/apex/*" into sc-dev