Revert "Use a single file for app snapshots."

runtime/bin/file_android.cc

Index: runtime/bin/file_android.cc
diff --git a/runtime/bin/file_android.cc b/runtime/bin/file_android.cc
index a139876bdb3412d21c71b1ba3d54b538146d334d..9bcf44c8334e8c8361d8fc764398ba133705257d 100644
--- a/runtime/bin/file_android.cc
+++ b/runtime/bin/file_android.cc
@@ -78,23 +78,17 @@ bool File::IsClosed() {
 }
 
 
-void* File::Map(MapType type, int64_t position, int64_t length) {
+void* File::MapExecutable(intptr_t* len) {
   ASSERT(handle_->fd() >= 0);
-  int prot = PROT_NONE;
-  switch (type) {
-    case kReadOnly:
-      prot = PROT_READ;
-      break;
-    case kReadExecute:
-      prot = PROT_READ | PROT_EXEC;
-      break;
-    default:
-      return NULL;
-  }
-  void* addr = mmap(NULL, length, prot, MAP_PRIVATE,
-                    handle_->fd(), position);
+
+  intptr_t length = Length();
+  void* addr = mmap(0, length,
+                    PROT_READ | PROT_EXEC, MAP_PRIVATE,
+                    handle_->fd(), 0);
   if (addr == MAP_FAILED) {
-    return NULL;
+    *len = -1;
+  } else {
+    *len = length;
   }
   return addr;
 }