Fix another bug related to string constants

The string constant cache was keyed by StringId; this was unsafe when
combining APKs since different strings in different APKs can have the
same string ID, which led to false positive matches in the constant
cache.  This meant that some string arguments were wrong in the decoded
IR.