Merge "Revert "Make /data/data a symlink to /data/user/0"" am: 823816ee9f
am: 20a74298a5

Change-Id: I0673663db7b20b44867801f146e49235d15baf8a