Merge "Remove the bdev_type and sysfs_block_type SELinux attributes"