Merge \"Clean up StringReferenceValueComparator and DexFile.\"
am: 05f0167cdd

Change-Id: I58076c6c5df6c5765d565505909f17499281950a