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

Change-Id: I47a15256ec9c047e71f78ea42ff06b53b7492e58