am e817d75a: am 7c5ed3ad: Merge "Enable 64bit build for x64 target"

* commit 'e817d75ab0989cd87fb49996964d8c0bfd463d8f':
  Enable 64bit build for x64 target