Merge "init: rework fixup_sys_perms to use perm_path_matches"