Merge "Simplify the error message for ABI check" am: acccadc399 am: 5e8fd40e2d am: a6882be48c am: 8d65584c74 am: 37cf9ae9aa

Original change: https://android-review.googlesource.com/c/platform/development/+/2238114

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