Merge "Using stride (# of elements) instead of pitch (bytes) in fdct16x16."