Merge "Use audio_session_t consistently" into nyc-dev am: 9a57e34
am: 20f18ef

* commit '20f18efb29b8fea661dd4119a764d3f8d4dfe7a2':
  Use audio_session_t consistently