Fix #switch #default to match next (not last) named parameter.

Bug: 23192
Change-Id: I3a726b3aacb2a598f79c0dbebaa4f400ee2d9aa2