Merge "Switch to a shell_and_utilities phony module." am: cdcc4c52aa
am: b7b29357ae

Change-Id: I08efbab350cb47bfb63c706c49130b70461a205c