Merge "Enable x86 support"