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