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

Change-Id: I650941fee78fa9cefcc349e299865103e15216d2