Merge "Remove dependency on audio_* location"