Merge "x86_64: Enable compilation"