optional: minor improvements am: 5404a2f3df

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

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