Merge "Remove unused stride-by-8 resampling code"