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

Change-Id: Ic5105d82a9417ef8ce339ec41405548eb821eeea