Merge "Fix a bug in MediaPlayer's addExternalSource()."