optional: minor improvements am: 5404a2f3df am: 0d426765d2

Original change: https://android-review.googlesource.com/c/platform/external/libabigail/+/2252143

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