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

Change-Id: Ibd1b46228b53441688255414a843040b9cd104b2