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

Change-Id: Ic92d11b2a8fee3a71fbef580bc8498034be6a604