GitLab

am 9bd5a9db: Reconcile jb-dev and AOSP

* commit '9bd5a9db':
  Fix an ugly bug where try/catch offsets weren't being mapped properly. do not merge.
  Fix a bug where the max blowup of annotations was incorrect. do not merge.
  Fix a bug where debugInfos' size wasn't being computed. do not merge.
  Make dex merging stateless. do not merge.
  Support debug info in dexmerge. do not merge.