Merge "Class: Get rid of most of java.lang.DexCache."