Merge remote-tracking branch 'toybox/master' into HEAD

Change-Id: Ibe0ccccb99218e9c1d00e8c41725ecbac1a068d6

diff --cc .gitignore
index 475acd7,6705342..b21777a
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,11 -1,9 +1,13 @@@
 -.config*
+ syntax: glob
 -generated/
 -kconfig/mconf
 -kconfig/conf
 -kconfig/*.c
 +/.config.old
+ change/
- /toybox
- /toybox_unstripped
 +/generated/build.sh
 +/generated/config2help
 +/generated/Config.in
 +/generated/Config.probed
 +/generated/mkflags
 +/generated/obj
 +/generated/optlibs.dat
 +/kconfig
+ toybox
+ toybox_unstripped