Merge "Fix compiling error in vp9_idct.h"