Remove OBB bind mounts, now provided by FUSE.

The OBB storage area is now presented on a per-user basis by the FUSE
daemon, so we no longer need to create bind mounts.  (In fact, we
must use the FUSE daemon since it now correctly synthesizes UID
ownership on a per-user basis.)

Bug: 10506809
Change-Id: I763b340bb040396cbcc1f1f32277eca15fe69fc6
diff --git a/runtime/native/dalvik_system_Zygote.cc b/runtime/native/dalvik_system_Zygote.cc
index 4108559..2acacc9 100644
--- a/runtime/native/dalvik_system_Zygote.cc
+++ b/runtime/native/dalvik_system_Zygote.cc
@@ -340,13 +340,10 @@
 
     // /mnt/shell/emulated/0
     std::string source_user(StringPrintf("%s/%d", source, user_id));
-    // /mnt/shell/emulated/obb
-    std::string source_obb(StringPrintf("%s/obb", source));
     // /storage/emulated/0
     std::string target_user(StringPrintf("%s/%d", target, user_id));
 
     if (fs_prepare_dir(source_user.c_str(), 0000, 0, 0) == -1
-        || fs_prepare_dir(source_obb.c_str(), 0000, 0, 0) == -1
         || fs_prepare_dir(target_user.c_str(), 0000, 0, 0) == -1) {
       return false;
     }
@@ -365,23 +362,9 @@
       }
     }
 
-    // Now that user is mounted, prepare and mount OBB storage
-    // into place for current user
-
-    // /storage/emulated/0/Android
-    std::string target_android(StringPrintf("%s/%d/Android", target, user_id));
-    // /storage/emulated/0/Android/obb
-    std::string target_obb(StringPrintf("%s/%d/Android/obb", target, user_id));
-
-    if (fs_prepare_dir(target_android.c_str(), 0000, 0, 0) == -1
-        || fs_prepare_dir(target_obb.c_str(), 0000, 0, 0) == -1
-        || fs_prepare_dir(legacy, 0000, 0, 0) == -1) {
+    if (fs_prepare_dir(legacy, 0000, 0, 0) == -1) {
         return false;
     }
-    if (mount(source_obb.c_str(), target_obb.c_str(), NULL, MS_BIND, NULL) == -1) {
-      PLOG(WARNING) << "Failed to mount " << source_obb << " to " << target_obb;
-      return false;
-    }
 
     // Finally, mount user-specific path into place for legacy users
     if (mount(target_user.c_str(), legacy, NULL, MS_BIND | MS_REC, NULL) == -1) {