Merge "MediaPlayer2: use long type for media time."