Switching the common attribute over to using the generic diagnostic, and removing the now-unused diagnostic. Updates a test case.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@195581 91177308-0d34-0410-b5e6-96231b3b80d8