Merge "Cherry pick renaming changes from AOMedia branch" into nextgenv2