Merge "Fix OOB read in fortify str[np]cpy implementations found by hwasan." am: 2fbbc253f6
am: d42a1d1eaa

Change-Id: I466e252d7e6c8dd3d6093347ab062dfb5de614d5