Merge "Make /data/data a symlink to /data/user/0" am: 49bbe16447
am: c43da33005

Change-Id: I85aa1ad53b93241dba03f3076355daf1f7685843