Merge "runextractor" am: 05e86d0d7c am: b87583bf4f am: f659119538 am: d576300d98

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

Change-Id: I62e669c7e08d4d949d7171b53ceecb7a6b40aeff