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

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



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