Merge "Fix highbd masked variance function declaration" into nextgenv2