Improve recognition of template parameters.

Before: return a<b &&c> d;
After:  return a < b && c > d;

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