Merge "Added getter for session Id to AudioSink" into gingerbread