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

Change-Id: Iec7c27678feb2e87e15d96829e9b11990caa490b