Merge "audio policy: fix build"