Merge "Split shell_and_utilities into partition parts." am: a242a4ba06
am: 548d115e97

Change-Id: I06aab4a4aea626d84686e2de568fcc21adb41097