Merge "vpx: [x86] add vp9_block_error_fp_avx2()"