Merge VDSO changes we're keeping in a topic branch, in case they conflict with other VDSO changes in flight.