Merge "MediaPlayer2: use TrackInfo based track APIs"