Merge "init: remove restorecon() from util.cpp" into oc-dev-plus-aosp