Merge "vp9_reconintra: simplify d63_predictor"