Merge "Fix 624-checker-stringops for PIC." am: 2bece1f9df am: 52c71abe3f
am: f088db9f8a

Change-Id: I9ebdc5dc7dd3c8424904ee83056a4506e9866e24