Merge "Change 1/2 spill slots to more general number of spill slots."
am: af818fab0a

Change-Id: I85f6b15c0a607e4ed07d4b9f48b11baa8aa1f863