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

Change-Id: I651d0afacc88111fc62db4d21c25b8b369f7bc21