Merge "Bug fix for the MediaPlayer::prepare() api."