Merge "Handle entropy coder experiment dependencies" into nextgenv2