Merge "Revert "Make /data/data a symlink to /data/user/0""