Merge "init: tighten sysfs_type permissions"