Merge "_FORTIFY_SOURCE: add memset / bzero support"