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

Change-Id: Ia16ff904dfa7f8c7d9afcb3db2b5bb56829256f7