Merge "Update MediaPlayer and MediaRecorder javadoc"