Merge "Switch to a shell_and_utilities phony module." into oc-dev
am: 24011de5d5  -s ours

Change-Id: Ie5178f6f60da8951ee0ec91b89f98edfd2ac850a