x86, vdso: Move the vvar and hpet mappings next to the 64-bit vDSO