Frame scaling comp mask pred crash fix

`aom_comp_mask_upsampled_pred()`: unconditionally call
`aom_upsampled_pred()` to gracefully handle scaling.

Change-Id: I7727f9a812cfcd48f6e215185b260cff7db177f0
(cherry picked from commit 74aaa1eff111badcfd471748ed790a5a9cc8cb23)

av1/encoder/reconinter_enc.c

diff --git a/av1/encoder/reconinter_enc.c b/av1/encoder/reconinter_enc.c
index fd751cd..0185438 100644
--- a/av1/encoder/reconinter_enc.c
+++ b/av1/encoder/reconinter_enc.c
@@ -523,14 +523,9 @@
                                   int ref_stride, const uint8_t *mask,
                                   int mask_stride, int invert_mask,
                                   int subpel_search) {
-  if (subpel_x_q3 | subpel_y_q3) {
-    aom_upsampled_pred(xd, cm, mi_row, mi_col, mv, comp_pred, width, height,
-                       subpel_x_q3, subpel_y_q3, ref, ref_stride,
-                       subpel_search);
-    ref = comp_pred;
-    ref_stride = width;
-  }
-  aom_comp_mask_pred(comp_pred, pred, width, height, ref, ref_stride, mask,
+  aom_upsampled_pred(xd, cm, mi_row, mi_col, mv, comp_pred, width, height,
+                     subpel_x_q3, subpel_y_q3, ref, ref_stride, subpel_search);
+  aom_comp_mask_pred(comp_pred, pred, width, height, comp_pred, width, mask,
                      mask_stride, invert_mask);
 }