Merge commit 'f031d6100856e9f398e9f0aa5336df59440c836f' of sso://googleplex-android/platform/external/selinux into HEAD
Change-Id: Ic0b0704dcbc93375e2fecfe77a3428036572d044