am 585b6cff: am f24c77e7: Merge "Restore dexdeps used by CTS"

* commit '585b6cffb432adc496a5b5dc896c28c8eec73510':
  Restore dexdeps used by CTS