Merge branch 'selinux' into cm-10.1

Change-Id: I2a419c75434be6a60c04a8c0a24287c872138617