Merge "Optimizing/ARM: Fix AddConstant() to adhere to set_cc." am: 0ac7a8e505
am: 84f8ba6329

* commit '84f8ba632953b08fd9d73c1e152cef9c9652c961':
  Optimizing/ARM: Fix AddConstant() to adhere to set_cc.