Start doing trivial merging of function prototypes. If we have a function

proto, then a function body, and they have the same type, don't emit an error.
This reduces #errors from 654->616

llvm-svn: 39324