selinux: resync to internal master

Some changes got lost in the AOSP push. Restore those changes.

Bug: 15428519
Change-Id: I0c13c1b99a41270b4a70081ad5480b3b5a7eee1f
7 files changed