am 5239bad2: am b177468b: Merge "Improve AudioTrack recovery from mediaserver...
am 5239bad2: am b177468b: Merge "Improve AudioTrack recovery from mediaserver death" into lmp-mr1-dev automerge: e662cd5c
* commit '5239bad2':
Improve AudioTrack recovery from mediaserver death