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

* commit 'ee2a10eb18a5e79fa958afc2d09c65e21c34e174':
  Fix x86_64 build