Merge "MIPS32: Use conditional moves to compute 64-bit shifts."
am: 52ccbde5d6

Change-Id: Ie5906c47cc1244f0ba3be9ee51f5ea262dedf608