Merge "Support dex version 39 in dexdeps" am: 2799b7380e am: 232f06a70c
am: 522db75b01

Change-Id: Ibe041f260c4bd41ffe048bd33a0c9669fac74595