Merge "prebuilts: update shell to latest version" am: 4cd8e2bd5a

Original change: https://android-review.googlesource.com/c/platform/prebuilts/tools/+/1679325

Change-Id: I58179257e0240a9b13971e57ce60684faf72faa7