Merge "Fix compile error with FORTIFY_SOURCE"