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

Change-Id: I2e4740a4a8ab2b6bdda3fe53598898fc4a1100d3