Merge "Optimize dexdeps code." am: a9e6e81858
am: a937690b71

Change-Id: Ia69cdf498113fe275e81ee8c39234703d8732017