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

* commit '4063bb6147bd256ad455bd3bd063ef40aae8851d':
  __strnlen_chk: avoid recursive strlen calls