Merge "init: remove restorecon() from util.cpp" am: 035b0c26e6
am: c2a9136c51

Change-Id: I93f8eabdba8002d3d864ac4337826adf9db8890d