Merge "init: consolidate restorecon after selinux initialization in single function"