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

Change-Id: I6f7d4ff2ec374d1719521ffe39db9c5892fe9535