Merge "Add x86 server support." into jb-mr2-dev