Merge "Move comments into selinux.h and fix"