Merge remote-tracking branch 'toybox/master' into HEAD am: b7cb33d2d4 am: 799cfb69ce

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

Change-Id: Ic6e20c3746198dd19e0b5113868aeb9e3d14ce8d