Fix multiple-return-value-to-first-class-aggregates autoupgrade to

correctly handle the case where multiple-return-value constructs
were used to return one or zero values.

llvm-svn: 53890