am 987616ed: Merge "Fix x86_64 build"

* commit '987616ed09adc65e6636f7a3a82fa7b38021b6e2':
  Fix x86_64 build