Merge "libvpx: vpx_add_plane_noise make c match assembly"