Merge "Switch to a shell_and_utilities phony module." into oc-dev