am b7f1c067: Merge "Work around ICE bugs with MIPS GCC and O1."

* commit 'b7f1c06737c14cccca91153c714f58d99c69adcc':
  Work around ICE bugs with MIPS GCC and O1.