Revert "Use the 'count' attribute instead of the 'upper_bound' attribute."

temporarily as it is breaking the gdb bots.

This reverts commit r167806/e7ff4c14.

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