Merge "Fix encoder crash when --enable-daala-ec" into nextgenv2