Merge "audiopolicy: engineconfigurable: fix build issues on Q environment" into qt-dev