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

Change-Id: I9aae2fbb52bcfc2017eb63b0f7b6df5c93c3ab2d