Merge "Update ARM for vpx_scale changes" into experimental