Merge "Fix failing TestBitIO test with --enable-daala_ec." into nextgenv2