CB-7512 Use aligned apk rather than unaligned apk when sorting
Merge branch 'master' into 4.0.x (unaligned apk fix)