Merge "Add matching brace in aomenc.c" into nextgenv2