Merge "MediaPlayer2: clarify sync/async for API's" into pi-dev