Merge "Code cleanup in vp9_encode_block_intra"