Merge "style fixes: vpx_scale.c assertion formatting"