Merge "vp9_reconintra: simplify d45_predictor"