Merge "Revert "Change dex caches to be weak roots""