am 6aed6077: Merge "Fix unnecessary call to __strncpy_chk2"

* commit '6aed6077fbe2b2039ab9160fb1e33ffe07907f32':
  Fix unnecessary call to __strncpy_chk2