Switch to a shell_and_utilities phony module. am: 00be8a3ecf  -s ours
am: c97d929049

Change-Id: I8de7b79578c42fce035e392e2217679bc1377dd2