Fix build issues when --enable-aom-qm

Change-Id: I1a462675c06c4b2a5f8b4b347f23fec67feccdd0
6 files changed