Merge "shell_and_utils: add vendor shell and toybox targets" am: 7d213d08e7
am: 175fb8ce3f

Change-Id: I5f7f55cf28531a940acaf16b2a14509011d024f4