Merge "Add addw support to x86 and x64."
am: 0530796b73

Change-Id: I975f8893d8424d14d485f7dac4fa33e0444cd107