am 6d8d16e5: am 1adb147c: Merge "fix libpagemap for x86_64"

* commit '6d8d16e5fe2c94cae49798c7efbeaf53c783a994':
  fix libpagemap for x86_64