am 0650d4a2: am 987616ed: Merge "Fix x86_64 build"

* commit '0650d4a2eadc96577b2e03fbda000ed5a340d8ac':
  Fix x86_64 build