Merge "init: remove restorecon() from util.cpp" am: 035b0c26e6 am: c2a9136c51
am: 6ac577230b  -s ours

Change-Id: I328600a2c439ecf1a7d482c4eb04a2ca07519322