Merge "Fix fortify compilation test on x86."