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

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

Change-Id: Ie0ca28e8c897792eae60fb707fcdfde75be8da1e