Merge "Add addw support to x86 and x64."