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

Change-Id: I855c877f6a2d397c9d846a242ff0990382e5e993