Merge "Fix block pointer corruption in intra8x8 prediction with 4x4 transform." into experimental

vp9/encoder/vp9_rdopt.c

@@ -1476,6 +1476,8 @@ static int64_t rd_pick_intra8x8block(VP9_COMP *cpi, MACROBLOCK *x, int ib,
                               &ta0, &tl0,
                               TX_4X4);
       }
+      b = &xd->block[ib];
+      be = &x->block[ib];
       rate += rate_t;
     }