Merge "x86_64: Add targets"