Merge "Simplify the error message for ABI check" am: acccadc399

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

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