Merge "MediaPlayer/MediaRecorder: Do not notify client of audioserver death" into nyc-dev