Merge "highbd idct: resolve missing declarations"