Merge "Simplify vp9_adapt_nmv_probs" into experimental