Merge "Separate MediaRecorderClient with MediaPlayerClient" into gingerbread