ObjectiveC driver change. re-apply patch reverted in
r194450 with a modified test. // rdar://15363492