Merge "Revert "Relax conditions to retrieve LV debug info""

dx/src/com/android/dx/Version.java

@@ -21,5 +21,5 @@ package com.android.dx;
  */
 public class Version {
     /** {@code non-null;} version string */
-    public static final String VERSION = "1.13";
+    public static final String VERSION = "1.12";
 }

dx/src/com/android/dx/cf/code/LocalVariableList.java

@@ -351,8 +351,7 @@ public final class LocalVariableList extends FixedSizeList {
          */
         public boolean matchesPcAndIndex(int pc, int index) {
             return (index == this.index) &&
-                // do not check that "pc >= startPc" because startPc may be later than the expected
-                // pc, if the bytecode has been modified, by Jacoco instrumentation for instance
+                (pc >= startPc) &&
                 (pc < (startPc + length));
         }