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

* commit 'b3681d1351086ba4dffa4752ac2114c7d8915914':
  Fix x86_64 build

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build