am b83add4d: am 5204b158: Merge "Fix x86_64 build"

* commit 'b83add4d713767f9b9356e8fc529b728a1a6fe95':
  Fix x86_64 build