Merge "Fix token allocation for non-4:2:0" into experimental
authorJohn Koleszar <jkoleszar@google.com>
Fri, 10 May 2013 23:57:09 +0000 (16:57 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 10 May 2013 23:57:09 +0000 (16:57 -0700)

Trivial merge