Merge commit '864c8583342f1de9c2406835e891d8af98ffe073' into eclair-mr2-plus-aosp * commit '864c8583342f1de9c2406835e891d8af98ffe073': Fix issue: no audio after media_server process crash while in call.