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

Change-Id: I865518d0e93ce2d5a785b1311f9bf98931aa7b94