Merge "Add dex 38 support to dexmerger"