am 2e544837: Merge commit \'cf052994\' into manualmerge

* commit '2e544837e7acb479c3e4e22f53835e9740800af7':
  Create optimized __strcpy_chk/__strcat_chk.