Merge "Force the VPX boolcoder trees in the ANS test." into nextgenv2