Merge "Cleaning up vp9_entropy.h file."