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

* commit '9a57e34f476d5d2400e6e8ffac303c6190e641f0':
  Use audio_session_t consistently