Merge "Move restorecon of /data earlier in boot sequence."