[x86] merge the olpc target with the x86 target, both tested and running