Revert "Merge "Change highbd variance rounding to prevent negative variance.""
This reverts commit ea48370a, reversing
changes made to 15939cb2.
The commit was insufficiently tested and causes failures.
Change-Id: I623d6fc2cd3ae6fd42d0abab1f8eada465ae57a7