Merge "Sort SELinux package inclusion."