Merge "Removing redundant references to VP9D_COMP struct."