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

Change-Id: Iccfa0b4c195216fa2c5de32aeb2bd66623336b89