Merge "Resolve build issue --enable-aom-qm" into nextgenv2