Merge "Restore dexdeps used by CTS"