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

Change-Id: I1522ab5101e15dc13b6f24e3f622e1a14a372f98