Merge "Make MediaPlayer.invoke() public-and-hidden again"