am 28317d3a: am f5ea738b: Merge "Fix x86 build."

* commit '28317d3a161c88f88e85d97d584d656ffbe63a19':
  Fix x86 build.