Merge "x86 compiler should handle the "div/rem by 1" case"