Merge "Support dex 37 for DexMerger"
am: 39f9f67

* commit '39f9f67115fc2457a2460b9aa5f38db097688669':
  Support dex 37 for DexMerger

Change-Id: I9ff042fb2723955ac7a1a6bbe9248f90350ea155