Merge "Move the selinux modules to core PRODUCT_PACKAGES"