Revert "Reduce size of TOKENEXTRA struct"

This reverts commit b7b1e6fb55. Previous
fix is incomplete, breaks ARM. Itchy submit finger.

Change-Id: I939dc0d3bf4173cf951c1d152338ab6ea2184bb9

vp8/encoder/tokenize.h

@@ -25,10 +25,11 @@ typedef struct
 
 typedef struct
 {
+    int Token;
+    int Extra;
     const vp8_prob *context_tree;
-    char            skip_eob_node;
-    char            Token;
-    short           Extra;
+    int skip_eob_node;
+    int section;
 } TOKENEXTRA;
 
 int rd_cost_mby(MACROBLOCKD *);