Merge "Remove macroblock::skip_optimize." into nextgenv2