Merge "Fix in token allocation with zerogroup expt" into experimental

vp9/common/vp9_onyxc_int.h

@@ -362,6 +362,10 @@ static int get_mb_col(const MACROBLOCKD *xd) {
 }
 
 static int get_token_alloc(int mb_rows, int mb_cols) {
+#if CONFIG_CODE_ZEROGROUP
+  return mb_rows * mb_cols * (24 * 16 * 2);
+#else
   return mb_rows * mb_cols * (24 * 16 + 4);
+#endif
 }
 #endif  // VP9_COMMON_VP9_ONYXC_INT_H_