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

Change-Id: I2a25e0ee3ef3049fc0f821f9aee21b1411dfa6d3