Merge "init: don't restorecon root sepolicy files" am: b5b7d0a777
am: bcfb1f3418

Change-Id: Id55cc40773b5416670cc3f5f615170f25c0b6bf5