Merge "Remove unused members from VP9_COMP"