Merge "Mark the phony shell_and_utilities_vendor as vendor: true" into main