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

Change-Id: I554d806d221e3b0c4debaebf6337f241cb10da5d