Merge "minor fix to eob check for setting CONTEXT" into experimental

diff --cc vp9/decoder/vp9_detokenize.c
Simple merge

diff --cc vp9/encoder/vp9_encodemb.c
Simple merge

diff --cc vp9/encoder/vp9_rdopt.c
Simple merge

diff --cc vp9/encoder/vp9_tokenize.c
index 292b6be961ec8cc5d80a06f3564b1b5495a759e8,f36c2cdae5990d11429890790199f371600f0844..44963b2237dfa050ec8351ce3f4c7a713fe195b2
--- 1/vp9/encoder/vp9_tokenize.c
--- 2/vp9/encoder/vp9_tokenize.c
+++ b/vp9/encoder/vp9_tokenize.c
@@@ -212,10 -212,10 +212,10 @@@ static void tokenize_b(VP9_COMP *cpi
    } while (c < eob && ++c < seg_eob);
  
    *tp = t;
-   *a = *l = (c != !type); /* 0 <-> all coeff data is zero */
+   *a = *l = (c > !type); /* 0 <-> all coeff data is zero */
  }
  
 -int vp9_mby_is_skippable_4x4(MACROBLOCKD *xd, int has_y2_block) {
 +int vp9_mby_is_skippable_4x4(MACROBLOCKD *xd, int has_2nd_order) {
    int skip = 1;
    int i = 0;