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

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

Change-Id: Ie8c8c57abe94f8172928d07cd77487b957a7ff1b