Merge "Remove repeated header files from vp9_block.h"