am 3043b188: Merge "Fix build for x86_64"

* commit '3043b1884e42ad9cfc7791b09d3cffc5f1ac13aa':
  Fix build for x86_64