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

Change-Id: I1c6dea8e60e96804c9d7564b367c21b146728072