Implement a better fix for r186894 by setting the appropriate type for __byref_variable_layout.

rdar://problem/14386148