Merge "shell_and_utils: add vendor shell and toybox targets"