Merge "Add dex 38 support to dexmerger"
am: 2fbbc05132

Change-Id: I73aa0b83b46af6e6d7923c9913ab60705ef10730