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

Change-Id: Ib58a38a624151f3e24af8fd4c3d073584d8f03ca