Merge "Fix unnecessary call to __strncpy_chk2"