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

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

Change-Id: I39e5e4a6d33bb97e3e18d9dcafd9d67e57f35200