Merge "Make 624-checker-stringops less Dexer-sensitive." am: 97785f59 am: 0e8f75dd am: 1ac715ce am: d8407147 Change-Id: I972166d126043ef1610772652d7c86ebc49a9868