Merge "vp8cx: remove deprecated reference/entropy controls"