Merge "Use audio_session_t consistently" into nyc-dev