Merge "Simplify variable defs in av1_encode_block_intra" into nextgenv2