Merge "aom_mem.c: remove unnecessary inline" into nextgenv2