Merge remote-tracking branch 'toybox/master' into HEAD am: 48ecd3a575 am: 1ee3b5cac0 am: de1cff1a5c am: dcacb9b215

Original change: https://android-review.googlesource.com/c/platform/external/toybox/+/1690088

Change-Id: I0b4a5c534f9870f85a65a997fdc06634311f47c8