Merge "init: remove restorecon() from util.cpp"