Merge "Support dex version 38 in dexdeps" am: 41e5eb8ea7 am: 7ab42f0266
am: 3063a957de

Change-Id: Ic56d9b11b052de3d94004fa82a7b30acbd95950c