Temp fix for ctrl based resize setting

Temporary fix for a resize test. When resize is set through
a control, the border size is currently not upgraded to
a thicker border. This patch is a temporary fix to always
use the thicker border for scaled reference frames.
However this patch does not fix the border for existing
reference buffers if resize is set through a control
mid-stream. That will be fixed subsequently.

BUG=aomedia:2348

Change-Id: I1ccb82f0444ab8bab58f864a58cf6d600c5616f0
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 0441cbd..9174d2e 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -3381,7 +3381,7 @@
           if (aom_realloc_frame_buffer(
                   &new_fb->buf, cm->width, cm->height,
                   cm->seq_params.subsampling_x, cm->seq_params.subsampling_y,
-                  cm->seq_params.use_highbitdepth, cpi->oxcf.border_in_pixels,
+                  cm->seq_params.use_highbitdepth, AOM_BORDER_IN_PIXELS,
                   cm->byte_alignment, NULL, NULL, NULL)) {
             if (force_scaling) {
               // Release the reference acquired in the get_free_fb() call above.