Merge "Support dex version 39 in dexdeps"
am: 2799b7380e

Change-Id: Ice2673670b9575b8e68ec4e0924c847c793b42ba