Merge "VPX: remove scaled calls from FUN_CONV_1D"