Merge "Fix ec_adapt+daala_ec test failure" into nextgenv2