Merge "Change to use aom copyright notice" into nextgenv2