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

Change-Id: Ic5165fa5ee7504120cac025b1e73d2bda5e0856b