Pretty mechanical patch to fix the selection of ANDWri.
I didn't add new tests because the all the code I touched is currently exercised by the tests. I just can't add -verify-machineinstrs everywhere just yet. Should I add specific tests for the cases? I'm working towards adding -verify-machineinstrs to more tests, so they should be guarded soon.