Merge "Add more information to the ABI error message." into main am:...

Merge "Add more information to the ABI error message." into main am: 98b3cb27 am: dc02013b am: cc7b24f3 am: 06669823 am: 1f66a568

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



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