am 0b2bfbd4: Merge "Fix tests now that the SSA builder is pruning more phis."

* commit '0b2bfbd440f86c8c0c7ab41b74d5557edf6e9d49':
  Fix tests now that the SSA builder is pruning more phis.