linux changes for 1e02f4 release am: 4c41a32375 am: 47e7a71df9

Original change: https://android-review.googlesource.com/c/platform/prebuilts/bazel/linux-x86_64/+/2777190

Change-Id: Ifb14b876e970fd2fff6abebb2b440ef885c0c289
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>