Merge "Improve AudioTrack recovery from mediaserver death" into lmp-mr1-dev