Merge "Bug 4184736 unhide MediaPlayer.setTexture"