Merge "Fix up dex cache strings stored in classes"