Merge "Remove redundant header file from vp9_encoder.h"