Final shuffle to make /sdcard work in shell.

Move legacy mount location to /storage/emulated/legacy, and create
a symlink to point towards shell-visible FUSE daemon.  This symlink
is then masked from zygote-forked apps by a tmpfs.

Bug: 7255202
Change-Id: Ibbc06db77ab5824aa84bf2ac1228a64722e82e7b
diff --git a/init.grouper.rc b/init.grouper.rc
index 0a84c8b..3e4d862 100644
--- a/init.grouper.rc
+++ b/init.grouper.rc
@@ -7,18 +7,16 @@
     # See storage config details at http://source.android.com/tech/storage/
     mkdir /mnt/shell/emulated 0700 shell shell
     mkdir /storage/emulated 0000 root root
-    mkdir /storage/emulated_legacy 0000 root root
 
-    export EXTERNAL_STORAGE /storage/emulated_legacy
-    export ADB_EXTERNAL_STORAGE /mnt/shell/emulated/0
-
+    export EXTERNAL_STORAGE /storage/emulated/legacy
     export EMULATED_STORAGE_SOURCE /mnt/shell/emulated
     export EMULATED_STORAGE_TARGET /storage/emulated
 
     # Support legacy paths
-    symlink /storage/emulated_legacy /sdcard
-    symlink /storage/emulated_legacy /mnt/sdcard
-    symlink /storage/emulated_legacy /storage/sdcard0
+    symlink /storage/emulated/legacy /sdcard
+    symlink /storage/emulated/legacy /mnt/sdcard
+    symlink /storage/emulated/legacy /storage/sdcard0
+    symlink /mnt/shell/emulated/0 /storage/emulated/legacy
 
 on early-boot
     write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor interactive