am f24c77e7: Merge "Restore dexdeps used by CTS"

* commit 'f24c77e73715e20495d8681f1af0cdab6234ea7b':
  Restore dexdeps used by CTS