Merge "Renaming vp9_token_struct to vp9_token and removing previous typedef." into...

diff --cc vp9/common/vp9_entropy.c
Simple merge

diff --cc vp9/common/vp9_entropy.h
Simple merge

diff --cc vp9/common/vp9_entropymode.c
Simple merge

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

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