Merge "Added support for audio sessions in MediaPlayer and AudioTrack." into gingerbread