Since aom_comp_mask_upsampled_pred just call aom_upsampled_pred
and aom_comp_mask_pred, no need to separate c version from simd
version any more.

Change-Id: I1ff8bcae87d501c68a80708fd2dc6b74c6952f88