Merge "Optimize dexdeps code."