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

Change-Id: Iefb1d5bd77f5ad2adb9d94006d9e8c1de79685f4