Merge "Ignore libz internal_state ABI changes" into main