CB-7512 Use aligned apk rather than unaligned apk when sorting