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, 5 deletions

diff --git a/test/MultiDexModifiedSecondary/Second.java b/test/MultiDexModifiedSecondary/Second.java
index 3555a7ff36..08ad625bf0 100644
--- a/test/MultiDexModifiedSecondary/Second.java
+++ b/test/MultiDexModifiedSecondary/Second.java
@@ -15,11 +15,7 @@
  */
 
 class Second {
-  public String getThird() {
-    return "I Third That.";
-  }
-
   public String getSecond() {
-    return "I Second That.";
+    return "Modified";  // Must have the same length as original so that dex size is same.
   }
 }