Merge "Renaming vp9_short_fdct16x16 to vp9_fdct16x16."