Merge "FORTIFY_SOURCE: restore __memcpy_chk()"