Merge "Sync with aom branch for ext-refs" into nextgenv2