Merge "Refactor vp10_encode_block_intra" into nextgenv2