Merge "Change to call build_masked_compound_highbd()" into nextgenv2