Merge "Combine vp9_encode_block_intra and encode_block_intra"