Backport binary tarball assembly from 2.1 branch.