Merge "Reduce the scope of the header file used in vp9_context_tree.h"