Merge "init: rework fixup_sys_perms to use perm_path_matches" am: 0504a94cd9 am: e7028e3d38
am: 7aef62751b

* commit '7aef62751bd8a070c6d3d9b45987b0ed6d495658':
  init: rework fixup_sys_perms to use perm_path_matches

Change-Id: I96210ae1c1e1a90ee482a430cd40f9f1b9169e4a