Upstream lithium-codegen-s390 changes.