Merge "MediaPlayer: fix java doc for setSurface and setDisplay." into nyc-dev