Merge "Revert "Merge "Change highbd variance rounding to prevent negative variance."""
authorAlex Converse <aconverse@google.com>
Wed, 13 Jan 2016 21:51:23 +0000 (21:51 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 13 Jan 2016 21:51:23 +0000 (21:51 +0000)

Trivial merge