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

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

Change-Id: I13dafcbebc43496075ed3cb8dbdf354ba7842506