abitidy: Refactor sorting logic am: 0d7a60e63c

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

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