Merge "runextractor" am: 05e86d0d7c am: b87583bf4f

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

Change-Id: I1faa4f983ce4e4f1ea822a25a8b3a9987d8ad402