Merge "x86: sdk_x86 build target"