am d6809b35: am c1f81f90: am 27f2bfc4: Merge "Fix dex file pruning logic."

* commit 'd6809b35aff02fdccf7ac433005aba2d06bbc3ff':
  Fix dex file pruning logic.