am f7ba96dc: Merge "Improve DexFile debugging"

* commit 'f7ba96dcf561cc95389d19b81f51828315b4a2e8':
  Improve DexFile debugging