abitidy: Refactor sorting logic am: 0d7a60e63c am: 7c1ef4e509 am: 9df654a263

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

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