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

Change-Id: I13b869640fcfb8c42ae929602cf0b54f34651d36