am 9cb3708f: Merge "x86 build fix."

* commit '9cb3708f62dad3f32a1ff2fa3f0a745d8d524a32':
  x86 build fix.