Merge "Clean up StringReferenceValueComparator and DexFile."