am 5204b158: Merge "Fix x86_64 build"

* commit '5204b1580e0d0f38272c7da166eee9b88c14dc50':
  Fix x86_64 build