Merge "Non-rd speed >=5: Include H/V intra for bsize=16x16."