Merge "add AUDIO_EXT_ROUTING_HINT"