Revert^2 "Add support for dex containers (DEX v41)."

This reverts commit a3b8c73d8ae9943c8aaabf49349302b4c05cea71.

Reason for revert: Reland

Test: ./art/test.py -b --host --optimizing --64
Test: device boots with container dex enabled for framework
Test: tests pass with compax dex re-enabled
Change-Id: I100a796f5105c351a531a45dcbea8b0245f598a8

1 files changed, 1 insertions, 7 deletions

diff --git a/test/MultiDex/Second.java b/test/MultiDex/Second.java
index 5067bcc2e8..ec8849a402 100644
--- a/test/MultiDex/Second.java
+++ b/test/MultiDex/Second.java
@@ -16,12 +16,6 @@
 
 class Second {
   public String getSecond() {
-    return "I Second That.";
-  }
-
-  // This method makes sure the second dex file has quickening
-  // instructions.
-  public String callSecond() {
-    return getSecond();
+    return "Original";
   }
 }