Merge "init: allow init to restorecon on block devices and their symlinks" am: 2e934f7fc5
am: 4afe2e2841

Change-Id: I3be985c26ba95bb8d8a44084a918bf6714d4ed6c