Merge changes from topic "abigail-werror" am: e31a0713 am: 30cfbf22 am:...

Merge changes from topic "abigail-werror" am: e31a0713 am: 30cfbf22 am: d0399047 am: 4451946b am: 080cf3b2

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2065275



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