am d2aaf98a: am a757c8ed: Merge "Fix tests now that dead phis are removed when building SSA."

* commit 'd2aaf98a7ddb180e113df3ad55c45116961f384a':
  Fix tests now that dead phis are removed when building SSA.