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

Change-Id: I55c082450a4cdbd76d88acf2ab10f6063ad0b428