am 58a2429b: am 4063bb61: Merge "__strnlen_chk: avoid recursive strlen calls"

* commit '58a2429b5b3defd73457273b1cc375b7aaa54810':
  __strnlen_chk: avoid recursive strlen calls