Merge "Move comments into selinux.h and fix" am: e4cb2c49e3 am: d5926b0d96
am: a1f38a3193

Change-Id: Ifd3f3df04d72fbb0d8446c06ff18bf18c894c3ca