Merge "Avoid transcoding in MediaPlayers"