Merge "Sort SELinux package inclusion."
am: 15e1b5e239

Change-Id: I2411d85662baf7278d34955bd6eb7ae6938b1956