Merge "fix libpagemap for x86_64"