Merge "Better selinux device node labeling."