Merge "Fix 624-checker-stringops for PIC."