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

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

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