am 1bad0700: am f7ba96dc: Merge "Improve DexFile debugging"

* commit '1bad070037080f316e284d28046572df816e76a6':
  Improve DexFile debugging