Merge "audio: enable CUSTOM_AUDIO_POLICY"