Merge "Fix build issues when --enable-aom-qm" into nextgenv2