Merge "[optimizing] x86: Prefer add over lea if possible"