Merge "dex_cache: rewrite StringDexCachePair as DexCachePair<T>"