libvpx: Pull from upstream

source/libvpx/vp9/encoder/vp9_tokenize.h

Index: source/libvpx/vp9/encoder/vp9_tokenize.h
===================================================================
--- source/libvpx/vp9/encoder/vp9_tokenize.h	(revision 219822)
+++ source/libvpx/vp9/encoder/vp9_tokenize.h	(working copy)
@@ -31,19 +31,19 @@
 typedef int64_t vp9_coeff_accum[REF_TYPES][COEF_BANDS][PREV_COEF_CONTEXTS]
                                [MAX_ENTROPY_TOKENS + 1];
 
-int vp9_sb_is_skippable(MACROBLOCKD *xd, BLOCK_SIZE_TYPE bsize);
-int vp9_sby_is_skippable(MACROBLOCKD *xd, BLOCK_SIZE_TYPE bsize);
-int vp9_sbuv_is_skippable(MACROBLOCKD *xd, BLOCK_SIZE_TYPE bsize);
+int vp9_sb_is_skippable(MACROBLOCKD *xd, BLOCK_SIZE bsize);
+int vp9_is_skippable_in_plane(MACROBLOCKD *xd, BLOCK_SIZE bsize,
+                              int plane);
 struct VP9_COMP;
 
 void vp9_tokenize_sb(struct VP9_COMP *cpi, TOKENEXTRA **t, int dry_run,
-                     BLOCK_SIZE_TYPE bsize);
+                     BLOCK_SIZE bsize);
 
 #ifdef ENTROPY_STATS
 void init_context_counters();
 void print_context_counters();
 
-extern vp9_coeff_accum context_counters[TX_SIZE_MAX_SB][BLOCK_TYPES];
+extern vp9_coeff_accum context_counters[TX_SIZES][BLOCK_TYPES];
 #endif
 
 extern const int *vp9_dct_value_cost_ptr;