Merge "Switch to a shell_and_utilities phony module."
am: 2aeed10a28

Change-Id: Id1a3cd08ad08793c49d1f8618b87ae9712619196