Improve handling of trailing block comments

This is a follow up to r174309 to actually make it work.

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